135. Araxis Merge File Comparison Report

Produced by Araxis Merge on 2021-05-13 09:08:51 +0000. See www.araxis.com for information about Merge. This report uses XHTML and CSS2, and is best viewed with a modern standards-compliant browser. For optimum results when printing this report, use landscape orientation and enable printing of background images and colours in your browser.

135.1 Files compared

#LocationFileLast Modified
1/Applications/Ampps/www/Porto 3.2.2/Theme Files/Magento 2.x/Porto Theme/app/code/Smartwave/Porto/etc/importdemo20_old.xml2019-12-13 09:07:48 +0000
22021-05-13 09:08:51 +0000

135.2 Comparison summary

DescriptionBetween
Files 1 and 2
Text BlocksLines
Unchanged00
Changed00
Inserted00
Removed1960

135.3 Comparison options

WhitespaceConsecutive whitespace is treated as a single space
Character caseDifferences in character case are significant
Line endingsDifferences in line endings (CR and LF characters) are ignored
CR/LF charactersNot shown in the comparison detail
Active line-pairing rules

135.4 Active regular expressions

No regular expressions were active.

135.5 Comparison detail

1 <root>    
2  <config>    
3           
4   <web>    
5                
6    <default>    
7                     
8     <cms_home_page>    
9      porto_home_20_old    
10     </cms_home_page>    
11                     
12     <cms_no_route>    
13      no-route-2    
14     </cms_no_route>    
15                 
16    </default>    
17            
18   </web>    
19           
20   <cms>    
21                
22    <wysiwyg>    
23                     
24     <enabled>    
25      hidden    
26     </enabled>    
27                 
28    </wysiwyg>    
29            
30   </cms>    
31   »           
32   <design>    
33    »       »           
34    <header>    
35     »       »       »           
36     <logo_width>    
37     </logo_width>    
38     »       »       »           
39     <logo_height>    
40     </logo_height>    
41     »       »       »           
42     <logo_src>    
43      default/logo_white_plus.png    
44     </logo_src>    
45     »       »           
46    </header>    
47    »           
48   </design>    
49   »           
50   <dev>    
51    »       »           
52    <js>    
53     »       »       »           
54     <merge_files>    
55      1    
56     </merge_files>    
57     »       »           
58    </js>    
59    »           
60   </dev>    
61           
62   <porto_settings>    
63                
64    <general>    
65                     
66     <boxed>    
67      wide    
68     </boxed>    
69                     
70     <layout>    
71      full_width    
72     </layout>    
73                     
74     <disable_border_radius>    
75      1    
76     </disable_border_radius>    
77                     
78     <show_site_notice>    
79      0    
80     </show_site_notice>    
81                     
82     <category_list_on_left>    
83      0    
84     </category_list_on_left>    
85                 
86    </general>    
87                
88    <header>    
89                     
90     <header_type>    
91      13    
92     </header_type>    
93                     
94     <new_skin>    
95      0    
96     </new_skin>    
97                     
98     <static_block>    
99     </static_block>    
100                     
101     <sticky_header_logo>    
102      0    
103     </sticky_header_logo>    
104     »       »       »           
105     <sticky_header_logo_src>    
106      default/logo_white_plus.png    
107     </sticky_header_logo_src>    
108                     
109     <currency_short>    
110      1    
111     </currency_short>    
112                     
113     <language_flag>    
114      0    
115     </language_flag>    
116                 
117    </header>    
118                
119    <footer>    
120                     
121     <footer_top>    
122      0    
123     </footer_top>    
124                     
125     <footer_top_block>    
126      custom    
127     </footer_top_block>    
128                     
129     <footer_top_custom>    
130     </footer_top_custom>    
131                     
132     <footer_middle>    
133      1    
134     </footer_middle>    
135                     
136     <footer_ribbon>    
137      0    
138     </footer_ribbon>    
139                     
140     <footer_ribbon_text>    
141      Ribbon Text    
142     </footer_ribbon_text>    
143                     
144     <footer_middle_column_1>    
145      custom    
146     </footer_middle_column_1>    
147                     
148     <footer_middle_column_1_custom>    
149      porto_footer_middle_1_for_20    
150     </footer_middle_column_1_custom>    
151                     
152     <footer_middle_column_1_size>    
153      4    
154     </footer_middle_column_1_size>    
155                     
156     <footer_middle_column_2>    
157      custom    
158     </footer_middle_column_2>    
159                     
160     <footer_middle_column_2_custom>    
161      porto_footer_middle_2_for_20    
162     </footer_middle_column_2_custom>    
163                     
164     <footer_middle_column_2_size>    
165      2    
166     </footer_middle_column_2_size>    
167                     
168     <footer_middle_column_3>    
169      custom    
170     </footer_middle_column_3>    
171                     
172     <footer_middle_column_3_custom>    
173      porto_footer_middle_3_for_20    
174     </footer_middle_column_3_custom>    
175                     
176     <footer_middle_column_3_size>    
177      2    
178     </footer_middle_column_3_size>    
179                     
180     <footer_middle_column_4>    
181      custom    
182     </footer_middle_column_4>    
183                     
184     <footer_middle_column_4_custom>    
185      porto_footer_middle_4_for_20    
186     </footer_middle_column_4_custom>    
187                     
188     <footer_middle_column_4_size>    
189      4    
190     </footer_middle_column_4_size>    
191                     
192     <footer_middle_2>    
193      0    
194     </footer_middle_2>    
195                     
196     <footer_middle_2_column_1>    
197      custom    
198     </footer_middle_2_column_1>    
199                     
200     <footer_middle_2_column_1_custom>    
201      porto_footer_links    
202     </footer_middle_2_column_1_custom>    
203                     
204     <footer_middle_2_column_1_size>    
205      3    
206     </footer_middle_2_column_1_size>    
207                     
208     <footer_middle_2_column_2>    
209      custom    
210     </footer_middle_2_column_2>    
211                     
212     <footer_middle_2_column_2_custom>    
213      porto_footer_links    
214     </footer_middle_2_column_2_custom>    
215                     
216     <footer_middle_2_column_2_size>    
217      3    
218     </footer_middle_2_column_2_size>    
219                     
220     <footer_middle_2_column_3>    
221      custom    
222     </footer_middle_2_column_3>    
223                     
224     <footer_middle_2_column_3_custom>    
225      porto_footer_links    
226     </footer_middle_2_column_3_custom>    
227                     
228     <footer_middle_2_column_3_size>    
229      3    
230     </footer_middle_2_column_3_size>    
231                     
232     <footer_middle_2_column_4>    
233      custom    
234     </footer_middle_2_column_4>    
235                     
236     <footer_middle_2_column_4_custom>    
237      porto_footer_links    
238     </footer_middle_2_column_4_custom>    
239                     
240     <footer_middle_2_column_4_size>    
241      3    
242     </footer_middle_2_column_4_size>    
243                     
244     <footer_bottom>    
245      1    
246     </footer_bottom>    
247                     
248     <footer_store_switcher>    
249      0    
250     </footer_store_switcher>    
251                     
252     <footer_logo_src>    
253     </footer_logo_src>    
254                     
255     <footer_bottom_copyrights>    
256      <![CDATA[&copy; 2020. ALL RIGHTS RESERVED.]]>    
257     </footer_bottom_copyrights>    
258                     
259     <footer_bottom_custom_1>    
260     </footer_bottom_custom_1>    
261                     
262     <footer_bottom_custom_2>    
263     </footer_bottom_custom_2>    
264                 
265    </footer>    
266                
267    <category>    
268                     
269     <alternative_image>    
270      1    
271     </alternative_image>    
272                     
273     <aspect_ratio>    
274      0    
275     </aspect_ratio>    
276                     
277     <ratio_width>    
278      300    
279     </ratio_width>    
280                     
281     <ratio_height>    
282      400    
283     </ratio_height>    
284                     
285     <rating_star>    
286      1    
287     </rating_star>    
288                     
289     <product_price>    
290      1    
291     </product_price>    
292                     
293     <actions>    
294      1    
295     </actions>    
296                     
297     <addtocompare>    
298      1    
299     </addtocompare>    
300                     
301     <addtowishlist>    
302      1    
303     </addtowishlist>    
304                     
305     <page_layout>    
306      2columns-left    
307     </page_layout>    
308                     
309     <category_description>    
310      main_column    
311     </category_description>    
312                     
313     <side_custom_block>    
314      porto_category_side_custom_block    
315     </side_custom_block>    
316                 
317    </category>    
318                
319    <category_grid>    
320                     
321     <product_type>    
322      3    
323     </product_type>    
324                     
325     <columns>    
326      4    
327     </columns>    
328                 
329    </category_grid>    
330                
331    <product>    
332                     
333     <product_image_size>    
334      6    
335     </product_image_size>    
336                     
337     <side_custom_block>    
338      porto_product_side_custom_block    
339     </side_custom_block>    
340                     
341     <main_custom_block>    
342     </main_custom_block>    
343                     
344     <main_custom_block2>    
345     </main_custom_block2>    
346                     
347     <move_addtolinks>    
348      0    
349     </move_addtolinks>    
350                     
351     <move_upsell_full>    
352      0    
353     </move_upsell_full>    
354                     
355     <page_layout>    
356      2columns-right    
357     </page_layout>    
358                     
359     <tab_full_background>    
360      0    
361     </tab_full_background>    
362                     
363     <custom_block_next_tab>    
364     </custom_block_next_tab>    
365                     
366     <upsell_columns>    
367      4    
368     </upsell_columns>    
369                     
370     <move_upsell>    
371      0    
372     </move_upsell>    
373                 
374    </product>    
375    »       »           
376    <newsletter>    
377     »       »       »           
378     <logo_src>    
379      default/logo_black.png    
380     </logo_src>    
381     »       »           
382    </newsletter>    
383                
384    <contacts>    
385                     
386     <enable>    
387      1    
388     </enable>    
389                     
390     <full_width>    
391      0    
392     </full_width>    
393                     
394     <address>    
395      Porto2 Store    
396     </address>    
397                     
398     <latitude>    
399      -34.398    
400     </latitude>    
401                     
402     <longitude>    
403      150.884    
404     </longitude>    
405                     
406     <zoom>    
407      18    
408     </zoom>    
409                     
410     <infoblock>    
411      <![CDATA[<div class="row">    
412      <div class="col-md-12">    
413          <i class="porto-icon-phone"></i>    
414          <p>0201 203 2032</p>    
415          <p>0201 203 2032</p>    
416      </div>    
417      </div>    
418      <div class="row">    
419      <div class="col-md-12">    
420          <i class="porto-icon-mobile"></i>    
421          <p>201-123-3922</p>    
422          <p>302-123-3928</p>    
423      </div>    
424      </div>    
425      <div class="row">    
426      <div class="col-md-12">    
427          <i class="porto-icon-mail-alt"></i>    
428          <p>porto@gmail.com</p>    
429          <p>porto@portotemplate.com</p>    
430      </div>    
431      </div>    
432      <div class="row">    
433      <div class="col-md-12">    
434          <i class="porto-icon-skype"></i>    
435          <p>porto_skype</p>    
436          <p>proto_template</p>    
437      </div>    
438      </div>]]>    
439     </infoblock>    
440                     
441     <customblock>    
442     </customblock>    
443                 
444    </contacts>    
445                
446    <custom_settings>    
447                     
448     <custom_style>    
449      <![CDATA[.owl-theme .owl-dots .owl-dot span {    
450          background: #fff;    
451          border: 2px solid #000;    
452      }    
453      .owl-theme .owl-dots .owl-dot.active span, .owl-theme .owl-dots .owl-dot:hover span {    
454          background: #000;    
455      }    
456      .footer-middle {    
457          padding: 90px 80px;    
458      }    
459      .footer-middle > .container {    
460          width: 100%;    
461      }    
462      .footer-middle .newsletter label.label {    
463          display: none;    
464      }    
465      .footer-middle .newsletter #newsletter {    
466          background: transparent;    
467          border-radius: 0;    
468          height: 42px;    
469          padding: 10px 20px;    
470          display: block;    
471      }    
472      .footer-middle .newsletter button.action {    
473          font-size: 12px;    
474          font-weight: 700;    
475          line-height: 1;    
476          text-transform: uppercase;    
477          background-color: #fff;    
478          color: #000;    
479          padding: 0;    
480          letter-spacing: 3px;    
481          transition: all 0.3s;    
482          box-shadow: 3px 3px 0 rgba(255,255,255,0.5);    
483          margin: 20px 0;    
484          display: block;    
485          width: 100%;    
486          border-radius: 0;    
487          border: 0;    
488      }    
489      .footer-bottom {    
490          padding: 0 80px;    
491      }    
492      .footer-bottom > .container {    
493          padding: 25px 15px;    
494          border-top: 1px solid #4d4d4d;    
495          width: 100%;    
496      }    
497      .footer-bottom address {    
498          float: none;    
499          text-align: center;    
500          line-height: 40px;    
501      }    
502      .catalog-category-view .block-category-list .block-title {    
503          border: 0;    
504          background: transparent;    
505          color: #808080;    
506          text-transform: none;    
507          font-size: 20px;    
508          padding-left: 0;    
509      }    
510      .catalog-category-view .block-category-list .block-title strong {    
511          font-weight: 600;    
512      }    
513      .catalog-category-view .block-category-list .block-content {    
514          border: 0;    
515          background: transparent;    
516          padding-left: 0;    
517      }    
518      .catalog-category-view .block-category-list .block-content .item {    
519          margin: 0;    
520      }    
521      .catalog-category-view .block-category-list .block-content .item a {    
522          font-size: 13px;    
523          line-height: 2.5;    
524      }    
525      .catalog-category-view .filter-options-item .filter-options-title {    
526          background: transparent;    
527          border: 0;    
528          color: #808080;    
529          font-size: 20px;    
530          font-weight: 600;    
531          text-transform: none;    
532          padding-left: 0;    
533      }    
534      .catalog-category-view .filter-options-item .filter-options-content {    
535          background: transparent;    
536          border: 0;    
537          padding-left: 0;    
538      }    
539      .catalog-category-view .filter-options-content a {    
540          color: #000 !important;    
541          font-weight: 600;    
542      }    
543      .catalog-category-view .filter-options-content a > input[type=checkbox] {    
544          display: inline-block;    
545          vertical-align: top;    
546          margin: 3px 5px 0 0;    
547      }    
548      .catalog-category-view .filter-options-content .count {    
549          color: #000;    
550      }    
551      .catalog-category-view .filter-options-title:after {    
552          border: 0;    
553          color: #000;    
554      }    
555      .catalog-category-view .filter-options-title:hover:after {    
556          background: transparent;    
557          color: #000;    
558      }    
559      #ln_slider_price.ui-slider-horizontal {    
560          background: #505050;    
561      }    
562      @media (max-width: 991px) {    
563          .footer-middle {    
564              padding: 50px 15px;    
565          }    
566          .footer-middle .block {    
567              margin-bottom: 30px;    
568          }    
569          .ajax-products {    
570              padding: 0 15px;    
571          }    
572          .footer-bottom {    
573              padding: 0 30px;    
574          }    
575      }    
576      @media (max-width: 767px) {    
577          .footer .block .block-content {    
578              max-width: 300px;    
579          }    
580      }    
581      @media (min-width:768px) {    
582          body.layout-fullwidth.catalog-category-view .page-main {    
583              padding-top: 0;    
584              padding-bottom: 0;    
585          }    
586          .catalog-category-view .columns .column.main {    
587              border-left: 1px solid #dcdcdc;    
588              position: relative;    
589              left: -1px;    
590              padding: 50px 0 50px 35px;    
591          }    
592          .catalog-category-view .columns .column.main.toggle-close {    
593              border-left-color: transparent;    
594          }    
595          .catalog-category-view .sidebar.sidebar-main {    
596              border-right: 1px solid #dcdcdc;    
597              padding: 50px 35px 50px 0;    
598          }    
599      }    
600      @media (min-width:992px) {    
601          body.layout-fullwidth .page-wrapper > .breadcrumbs .items {    
602              padding: 12px 85px;    
603          }    
604          body.layout-fullwidth.catalog-category-view .page-main {    
605              padding: 0 85px;    
606          }    
607      }    
608      @media (min-width:1200px) {    
609          .catalog-category-view .columns .column.main {    
610              width: 80%;    
611          }    
612          .catalog-category-view.page-layout-2columns-left .sidebar-main {    
613              width: 20%;    
614          }    
615      }    
616      @media (min-width:1440px) {    
617          .catalog-category-view .columns .column.main {    
618              width: 85%;    
619          }    
620          .catalog-category-view.page-layout-2columns-left .sidebar-main {    
621              width: 15%;    
622          }    
623      }    
624      .block-category-list {    
625          margin-bottom: 15px;    
626      }    
627      .products-grid .product-item .product-item-info.type3 .weltpixel-quickview.weltpixel_quickview_button_v2 {    
628          border-radius: 0 0 5px 5px;    
629          font-family: "Open Sans";    
630          letter-spacing: 0;    
631      }    
632      .price-box .price {    
633          font-family: "Open Sans";    
634          font-weight: 600;    
635      }]]>    
636     </custom_style>    
637                     
638     <custom_style_2>    
639      <![CDATA[]]>    
640     </custom_style_2>    
641                 
642    </custom_settings>    
643            
644   </porto_settings>    
645           
646   <porto_design>    
647                
648    <general>    
649                     
650     <theme_color>    
651      000000    
652     </theme_color>    
653                 
654    </general>    
655                
656    <font>    
657                     
658     <custom>    
659      0    
660     </custom>    
661                     
662     <font_size>    
663     </font_size>    
664                     
665     <font_family>    
666     </font_family>    
667                     
668     <custom_font_family>    
669     </custom_font_family>    
670                     
671     <google_font_family>    
672     </google_font_family>    
673                     
674     <char_latin_ext>    
675     </char_latin_ext>    
676                     
677     <char_subset>    
678     </char_subset>    
679                 
680    </font>    
681                
682    <colors>    
683                     
684     <custom>    
685      0    
686     </custom>    
687                     
688     <text_color>    
689     </text_color>    
690                     
691     <link_color>    
692     </link_color>    
693                     
694     <link_hover_color>    
695     </link_hover_color>    
696                     
697     <button_bg_color>    
698     </button_bg_color>    
699                     
700     <button_text_color>    
701     </button_text_color>    
702                     
703     <button_hover_bg_color>    
704     </button_hover_bg_color>    
705                     
706     <button_hover_text_color>    
707     </button_hover_text_color>    
708                     
709     <addtowishlist_color>    
710     </addtowishlist_color>    
711                     
712     <addtowishlist_hover_color>    
713     </addtowishlist_hover_color>    
714                     
715     <addtocompare_color>    
716     </addtocompare_color>    
717                     
718     <addtocompare_hover_color>    
719     </addtocompare_hover_color>    
720                     
721     <breadcrumbs_bg_color>    
722     </breadcrumbs_bg_color>    
723                     
724     <breadcrumbs_color>    
725     </breadcrumbs_color>    
726                     
727     <breadcrumbs_links_color>    
728     </breadcrumbs_links_color>    
729                     
730     <breadcrumbs_links_hover_color>    
731     </breadcrumbs_links_hover_color>    
732                     
733     <sale_bg_color>    
734     </sale_bg_color>    
735                     
736     <sale_font_color>    
737     </sale_font_color>    
738                     
739     <new_bg_color>    
740     </new_bg_color>    
741                     
742     <new_font_color>    
743     </new_font_color>    
744                 
745    </colors>    
746                
747    <header>    
748                     
749     <custom>    
750      0    
751     </custom>    
752                     
753     <header_bgcolor>    
754     </header_bgcolor>    
755                     
756     <header_bg_image>    
757     </header_bg_image>    
758                     
759     <header_bordercolor>    
760     </header_bordercolor>    
761                     
762     <header_textcolor>    
763     </header_textcolor>    
764                     
765     <header_linkcolor>    
766     </header_linkcolor>    
767                     
768     <header_top_links_bgcolor>    
769     </header_top_links_bgcolor>    
770                     
771     <header_top_links_color>    
772     </header_top_links_color>    
773                     
774     <header_menu_bgcolor>    
775     </header_menu_bgcolor>    
776                     
777     <header_menu_color>    
778     </header_menu_color>    
779                     
780     <header_menu_hover_bgcolor>    
781     </header_menu_hover_bgcolor>    
782                     
783     <header_menu_hover_color>    
784     </header_menu_hover_color>    
785                     
786     <header_menu_classicmenu_bgcolor>    
787     </header_menu_classicmenu_bgcolor>    
788                     
789     <header_menu_classicmenu_bordercolor>    
790     </header_menu_classicmenu_bordercolor>    
791                     
792     <header_menu_classicmenu_color>    
793     </header_menu_classicmenu_color>    
794                     
795     <header_menu_classicmenu_hover_bgcolor>    
796     </header_menu_classicmenu_hover_bgcolor>    
797                     
798     <header_menu_classicmenu_hover_color>    
799     </header_menu_classicmenu_hover_color>    
800                     
801     <header_search_bgcolor>    
802     </header_search_bgcolor>    
803                     
804     <header_search_text_color>    
805     </header_search_text_color>    
806                     
807     <header_search_bordercolor>    
808     </header_search_bordercolor>    
809                     
810     <header_minicart_bgcolor>    
811     </header_minicart_bgcolor>    
812                     
813     <header_minicart_color>    
814     </header_minicart_color>    
815                     
816     <header_minicart_icon_color>    
817     </header_minicart_icon_color>    
818                 
819    </header>    
820                
821    <footer>    
822                     
823     <custom>    
824      1    
825     </custom>    
826                     
827     <footer_top_bgcolor>    
828      000000    
829     </footer_top_bgcolor>    
830                     
831     <footer_top_color>    
832     </footer_top_color>    
833                     
834     <footer_top_link_color>    
835     </footer_top_link_color>    
836                     
837     <footer_top_link_hover_color>    
838     </footer_top_link_hover_color>    
839                     
840     <footer_middle_bgcolor>    
841      000000    
842     </footer_middle_bgcolor>    
843                     
844     <footer_middle_color>    
845      A3A3A3    
846     </footer_middle_color>    
847                     
848     <footer_middle_link_color>    
849      A3A3A3    
850     </footer_middle_link_color>    
851                     
852     <footer_middle_link_hover_color>    
853      A3A3A3    
854     </footer_middle_link_hover_color>    
855                     
856     <footer_middle_title_color>    
857      FFFFFF    
858     </footer_middle_title_color>    
859                     
860     <footer_middle_links_icon_color>    
861      FFFFFF    
862     </footer_middle_links_icon_color>    
863                     
864     <footer_middle_ribbon_bgcolor>    
865     </footer_middle_ribbon_bgcolor>    
866                     
867     <footer_middle_ribbon_shadow_color>    
868     </footer_middle_ribbon_shadow_color>    
869                     
870     <footer_middle_ribbon_color>    
871     </footer_middle_ribbon_color>    
872                     
873     <footer_middle_2_bgcolor>    
874      000000    
875     </footer_middle_2_bgcolor>    
876                     
877     <footer_middle_2_color>    
878     </footer_middle_2_color>    
879                     
880     <footer_middle_2_link_color>    
881     </footer_middle_2_link_color>    
882                     
883     <footer_middle_2_link_hover_color>    
884     </footer_middle_2_link_hover_color>    
885                     
886     <footer_middle_2_title_color>    
887     </footer_middle_2_title_color>    
888                     
889     <footer_middle_2_links_icon_color>    
890     </footer_middle_2_links_icon_color>    
891                     
892     <footer_bottom_bgcolor>    
893      000000    
894     </footer_bottom_bgcolor>    
895                     
896     <footer_bottom_color>    
897      FFFFFF    
898     </footer_bottom_color>    
899                     
900     <footer_bottom_link_color>    
901      FFFFFF    
902     </footer_bottom_link_color>    
903                     
904     <footer_bottom_link_hover_color>    
905      FFFFFF    
906     </footer_bottom_link_hover_color>    
907                 
908    </footer>    
909                
910    <page>    
911                     
912     <custom>    
913      0    
914     </custom>    
915                     
916     <page_bgcolor>    
917     </page_bgcolor>    
918                     
919     <page_bg_image>    
920     </page_bg_image>    
921                     
922     <page_custom_style>    
923      <![CDATA[]]>    
924     </page_custom_style>    
925                 
926    </page>    
927                
928    <main>    
929                     
930     <custom>    
931      0    
932     </custom>    
933                     
934     <main_bgcolor>    
935     </main_bgcolor>    
936                     
937     <main_bg_image>    
938     </main_bg_image>    
939                     
940     <main_custom_style>    
941      <![CDATA[]]>    
942     </main_custom_style>    
943                 
944    </main>    
945            
946   </porto_design>    
947           
948   <mpsearch>    
949                
950    <general>    
951                     
952     <enabled>    
953      0    
954     </enabled>    
955                 
956    </general>    
957            
958   </mpsearch>    
959  </config>    
960 </root>